Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:53:34 +0000 (22:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:53:34 +0000 (22:53 -0700)

Trivial merge